1. Fix school name, fix an abbreviation and align more buildings

    Closed
    #166737397 5 171 0 0

  2. Aligned some buildings properly

    Closed
    #166736387 0 44 0 0